auto merge of #899 : linkmauve/cargo/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 17 Nov 2014 23:59:34 +0000 (23:59 +0000)
committerbors <bors@rust-lang.org>
Mon, 17 Nov 2014 23:59:34 +0000 (23:59 +0000)

Trivial merge